Do not add border_width to the first button initial coordinate, since it's

2007-06-27  Xan Lopez  <xan@gnome.org>

    * gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate):
    * gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate):

    Do not add border_width to the first button initial
    coordinate, since it's already taken into account in
    the allocation value. (#451484)

svn path=/trunk/; revision=18261

diff --git a/ChangeLog b/ChangeLog
index 25005c70795efad5517aa2aef00dc7f346162c6a..45a317e45daa8f7275892be46fbf3f60793a767c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-27  Xan Lopez  <xan@gnome.org>
+
+       * gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate):
+       * gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate):
+
+       Do not add border_width to the first button initial
+       coordinate, since it's already taken into account in
+       the allocation value. (#451484)
+
 2007-06-27  Michael Natterer  <mitch@imendio.com>
 
        Merged from maemo-gtk:

diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index 399ae19c04a1e18ea4851098b31c34236045802d..45ef1582bd3fe8a3a3887134634b123af2c2ab8d 100644 (file)
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -242,8 +242,7 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
       (allocation->width
        - (child_width * (nvis_children - n_secondaries)
          + spacing * (nvis_children - n_secondaries - 1)))/2
-      + (n_secondaries * child_width + n_secondaries * spacing)/2
-      + GTK_CONTAINER (box)->border_width;
+      + (n_secondaries * child_width + n_secondaries * spacing)/2;
     secondary_x = allocation->x + GTK_CONTAINER (box)->border_width;
     break;
   default:

diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index c7b72568079a8da2888f03cb04445de245bd1142..bbd6e9e53047f1617ab0054b7a39db9cbad5a62b 100644 (file)
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -246,8 +246,7 @@ gtk_vbutton_box_size_allocate (GtkWidget     *widget,
       (allocation->height
        - (child_height * (nvis_children - n_secondaries)
          + spacing * (nvis_children - n_secondaries - 1)))/2
-      + (n_secondaries * child_height + n_secondaries * spacing)/2
-      + GTK_CONTAINER (box)->border_width;
+      + (n_secondaries * child_height + n_secondaries * spacing)/2;
     secondary_y = allocation->y + GTK_CONTAINER (box)->border_width;
     break;
   default: